tests: Load unit tests as modules

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2822>

diff --git a/src/run-js-test.c b/src/run-js-test.c
index b2cbd82b79671405710fd5aabf314270b6d965ce..7ebaa0bbd0d08f9ec2763270d4245d0f0979c75d 100644 (file)
--- a/src/run-js-test.c
+++ b/src/run-js-test.c
@@ -45,7 +45,7 @@ main(int argc, char **argv)
   GjsContext *js_context;
   const char *filename;
   char *title;
-  int code;
+  uint8_t code;
 
   context = g_option_context_new (NULL);
 
@@ -82,7 +82,7 @@ main(int argc, char **argv)
   error = NULL;
 
   /* evaluate the script */
-  bool success = gjs_context_eval_file(js_context, filename, &code, &error);
+  bool success = gjs_context_eval_module_file(js_context, filename, &code, &error);
   if (!success) {
     g_printerr ("%s\n", error->message);
     exit (1);

diff --git a/tests/common/assertions.js b/tests/common/assertions.js
index a43e5594954ee778eb0d6e0e67ca91e64e7995ee..c254da0cccce06135e9b3434c113b6c9901abb1e 100644 (file)
--- a/tests/common/assertions.js
+++ b/tests/common/assertions.js
@@ -1,5 +1,3 @@
-/* exported assertArrayEquals */
-
 const JsUnit = imports.jsUnit;
 
 /**
@@ -10,7 +8,7 @@ const JsUnit = imports.jsUnit;
  * @param {T[]} array1 the first array
  * @param {T[]} array2 the second array
  */
-function assertArrayEquals(errorMessage, array1, array2) {
+export function assertArrayEquals(errorMessage, array1, array2) {
     JsUnit.assertEquals(`${errorMessage} length`, array1.length, array2.length);
     for (let j = 0; j < array1.length; j++)
         JsUnit.assertEquals(`${errorMessage} item ${j}`, array1[j], array2[j]);

diff --git a/tests/unit/highlighter.js b/tests/unit/highlighter.js
index dda206511e389f693f56b45df035c3f3f6906a59..961092c31f0c28d932576786525cd0878b0a815f 100644 (file)
--- a/tests/unit/highlighter.js
+++ b/tests/unit/highlighter.js
@@ -3,7 +3,7 @@
 // Test cases for SearchResult description match highlighter
 
 const JsUnit = imports.jsUnit;
-const Pango = imports.gi.Pango;
+import Pango from 'gi://Pango';
 
 const Environment = imports.ui.environment;
 Environment.init();

diff --git a/tests/unit/insertSorted.js b/tests/unit/insertSorted.js
index cd9f56606c54691ebf027f5a7b3b7e9fb149bf1e..2fbe6ceb9d86e8dadaeae512a164e338fc0ab52c 100644 (file)
--- a/tests/unit/insertSorted.js
+++ b/tests/unit/insertSorted.js
@@ -1,8 +1,7 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 // Test cases for Util.insertSorted
-
-const Assertions = imports.common.assertions;
+import * as Assertions from '../common/assertions.js';
 
 // Needed so that Util can bring some UI stuff
 // we don't actually use

diff --git a/tests/unit/jsParse.js b/tests/unit/jsParse.js
index 31796510c9306bad663bc1c05d742dedcc0505fd..cc3d578bc5d9e4690f66095701effb5aef40e924 100644 (file)
--- a/tests/unit/jsParse.js
+++ b/tests/unit/jsParse.js
@@ -4,7 +4,7 @@
 
 const JsUnit = imports.jsUnit;
 
-const Assertions = imports.common.assertions;
+import * as Assertions from '../common/assertions.js';
 const Environment = imports.ui.environment;
 Environment.init();
 

diff --git a/tests/unit/markup.js b/tests/unit/markup.js
index 1df1eb09b42e9b93ceb42b51d7eaac6c51a545c1..c10f2572d3c5f4f02ba232898d36bc925012787f 100644 (file)
--- a/tests/unit/markup.js
+++ b/tests/unit/markup.js
@@ -3,7 +3,7 @@
 // Test cases for MessageList markup parsing
 
 const JsUnit = imports.jsUnit;
-const Pango = imports.gi.Pango;
+import Pango from 'gi://Pango';
 
 const Environment = imports.ui.environment;
 Environment.init();

diff --git a/tests/unit/signalTracker.js b/tests/unit/signalTracker.js
index c6c6d4a7ecf8d5bfbc7301d53767c936444f6564..613fe4e716ae732867b6b1fe147904286c76a22f 100644 (file)
--- a/tests/unit/signalTracker.js
+++ b/tests/unit/signalTracker.js
@@ -2,7 +2,7 @@
 
 // Test cases for version comparison
 
-const GObject = imports.gi.GObject;
+import GObject from 'gi://GObject';
 
 const JsUnit = imports.jsUnit;
 const Signals = imports.misc.signals;